more stock icons - warning dialog, error dialog, DnD

diff --git a/ChangeLog b/ChangeLog
index c840c988116172d2c5157ce8788724467522b4fe..89d9f64e9687d5d57b025ed370757ff4fe78f2f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-11  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog-error.png: less drastic
+       * gtk/stock-icons/dialog-warning.png: no body parts. (I hope
+         "STOP" is international enough.
+       * gtk/stock-icons/stock_dnd*.png: get rid of the cursor
+       * gtk/stock-icons/stock_menu_properties.png: 16x16 version
+
 Mon Sep 10 21:26:24 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_set_buffer): Make
@@ -1036,6 +1044,7 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
+>>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c840c988116172d2c5157ce8788724467522b4fe..89d9f64e9687d5d57b025ed370757ff4fe78f2f6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2001-09-11  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog-error.png: less drastic
+       * gtk/stock-icons/dialog-warning.png: no body parts. (I hope
+         "STOP" is international enough.
+       * gtk/stock-icons/stock_dnd*.png: get rid of the cursor
+       * gtk/stock-icons/stock_menu_properties.png: 16x16 version
+
 Mon Sep 10 21:26:24 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_set_buffer): Make
@@ -1036,6 +1044,7 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
+>>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c840c988116172d2c5157ce8788724467522b4fe..89d9f64e9687d5d57b025ed370757ff4fe78f2f6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2001-09-11  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog-error.png: less drastic
+       * gtk/stock-icons/dialog-warning.png: no body parts. (I hope
+         "STOP" is international enough.
+       * gtk/stock-icons/stock_dnd*.png: get rid of the cursor
+       * gtk/stock-icons/stock_menu_properties.png: 16x16 version
+
 Mon Sep 10 21:26:24 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_set_buffer): Make
@@ -1036,6 +1044,7 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
+>>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c840c988116172d2c5157ce8788724467522b4fe..89d9f64e9687d5d57b025ed370757ff4fe78f2f6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2001-09-11  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog-error.png: less drastic
+       * gtk/stock-icons/dialog-warning.png: no body parts. (I hope
+         "STOP" is international enough.
+       * gtk/stock-icons/stock_dnd*.png: get rid of the cursor
+       * gtk/stock-icons/stock_menu_properties.png: 16x16 version
+
 Mon Sep 10 21:26:24 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_set_buffer): Make
@@ -1036,6 +1044,7 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
+>>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c840c988116172d2c5157ce8788724467522b4fe..89d9f64e9687d5d57b025ed370757ff4fe78f2f6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2001-09-11  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog-error.png: less drastic
+       * gtk/stock-icons/dialog-warning.png: no body parts. (I hope
+         "STOP" is international enough.
+       * gtk/stock-icons/stock_dnd*.png: get rid of the cursor
+       * gtk/stock-icons/stock_menu_properties.png: 16x16 version
+
 Mon Sep 10 21:26:24 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_set_buffer): Make
@@ -1036,6 +1044,7 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
+>>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c840c988116172d2c5157ce8788724467522b4fe..89d9f64e9687d5d57b025ed370757ff4fe78f2f6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2001-09-11  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog-error.png: less drastic
+       * gtk/stock-icons/dialog-warning.png: no body parts. (I hope
+         "STOP" is international enough.
+       * gtk/stock-icons/stock_dnd*.png: get rid of the cursor
+       * gtk/stock-icons/stock_menu_properties.png: 16x16 version
+
 Mon Sep 10 21:26:24 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_set_buffer): Make
@@ -1036,6 +1044,7 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
+>>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c840c988116172d2c5157ce8788724467522b4fe..89d9f64e9687d5d57b025ed370757ff4fe78f2f6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2001-09-11  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog-error.png: less drastic
+       * gtk/stock-icons/dialog-warning.png: no body parts. (I hope
+         "STOP" is international enough.
+       * gtk/stock-icons/stock_dnd*.png: get rid of the cursor
+       * gtk/stock-icons/stock_menu_properties.png: 16x16 version
+
 Mon Sep 10 21:26:24 2001  Joshua N Pritikin  <vishnu@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_set_buffer): Make
@@ -1036,6 +1044,7 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
+>>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/gtk/stock-icons/stock_dnd.png b/gtk/stock-icons/stock_dnd.png
new file mode 100644 (file)
index 0000000..21100d5
Binary files /dev/null and b/gtk/stock-icons/stock_dnd.png differ

diff --git a/gtk/stock-icons/stock_dnd_32.png b/gtk/stock-icons/stock_dnd_32.png
new file mode 100644 (file)
index 0000000..21100d5
Binary files /dev/null and b/gtk/stock-icons/stock_dnd_32.png differ

diff --git a/gtk/stock-icons/stock_dnd_multiple.png b/gtk/stock-icons/stock_dnd_multiple.png
index 7c7dcc8fa4d7dc79dfcc04cbf429d6412cbd4807..7c5fa1c2e7ffb3c2a1af20172aed6cb01d393753 100644 (file)
Binary files a/gtk/stock-icons/stock_dnd_multiple.png and b/gtk/stock-icons/stock_dnd_multiple.png differ

diff --git a/gtk/stock-icons/stock_dnd_multiple_32.png b/gtk/stock-icons/stock_dnd_multiple_32.png
index 7c7dcc8fa4d7dc79dfcc04cbf429d6412cbd4807..7c5fa1c2e7ffb3c2a1af20172aed6cb01d393753 100644 (file)
Binary files a/gtk/stock-icons/stock_dnd_multiple_32.png and b/gtk/stock-icons/stock_dnd_multiple_32.png differ

diff --git a/gtk/stock-icons/stock_menu_properties.png b/gtk/stock-icons/stock_menu_properties.png
new file mode 100644 (file)
index 0000000..b2ba923
Binary files /dev/null and b/gtk/stock-icons/stock_menu_properties.png differ

diff --git a/gtk/stock-icons/stock_properties_16.png b/gtk/stock-icons/stock_properties_16.png
new file mode 100644 (file)
index 0000000..b2ba923
Binary files /dev/null and b/gtk/stock-icons/stock_properties_16.png differ